From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Jun 2011 00:58:31 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~1241^2~19
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3c3a05dfb70656c56f60666a8c32a28d85f072fb;p=emacs.git

Merge from trunk.
---

3c3a05dfb70656c56f60666a8c32a28d85f072fb